From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Thu, 25 Mar 2010 22:03:49 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~19^2~25^2~32
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b6c7546dfc2e851b6481f9c79a65bc779796c6d7;p=emacs.git

Merge from mainline.
---

b6c7546dfc2e851b6481f9c79a65bc779796c6d7